lib_Support

===================================================================

Gbp-Pq: Topic kfreebsd
Gbp-Pq: Name lib_Support.diff

diff --git a/lib/Support/Triple.cpp b/lib/Support/Triple.cpp
index d419463e6a5e6f640432f96076a45758be24321c..92f606c43a99fcd88bd6b4e545db8fc497953a3f 100644 (file)
--- a/lib/Support/Triple.cpp
+++ b/lib/Support/Triple.cpp
@@ -183,7 +183,7 @@ StringRef Triple::getOSTypeName(OSType Kind) {
   case FreeBSD: return "freebsd";
   case Fuchsia: return "fuchsia";
   case IOS: return "ios";
-  case KFreeBSD: return "kfreebsd";
+  case kFreeBSD: return "kfreebsd";
   case Linux: return "linux";
   case Lv2: return "lv2";
   case MacOSX: return "macosx";
@@ -488,7 +488,7 @@ static Triple::OSType parseOS(StringRef OSName) {
     .StartsWith("freebsd", Triple::FreeBSD)
     .StartsWith("fuchsia", Triple::Fuchsia)
     .StartsWith("ios", Triple::IOS)
-    .StartsWith("kfreebsd", Triple::KFreeBSD)
+    .StartsWith("kfreebsd", Triple::kFreeBSD)
     .StartsWith("linux", Triple::Linux)
     .StartsWith("lv2", Triple::Lv2)
     .StartsWith("macos", Triple::MacOSX)

diff --git a/lib/Support/Unix/Path.inc b/lib/Support/Unix/Path.inc
index e83fafb87f2327082acc0d07eaa177e0fd21ebc1..a5b65c996af15bfef316f683c858ed824c7d81cb 100644 (file)
--- a/lib/Support/Unix/Path.inc
+++ b/lib/Support/Unix/Path.inc
@@ -62,7 +62,7 @@
 #define FSTATVFS fstatvfs
 #define STATVFS_F_FRSIZE(vfs) vfs.f_frsize
 #else
-#if defined(__OpenBSD__) || defined(__FreeBSD__)
+#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 #include <sys/mount.h>
 #include <sys/param.h>
 #elif defined(__linux__)